-
-
Notifications
You must be signed in to change notification settings - Fork 7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixes to include "Boards" and "Processor" entries in the "*.po" files. #127
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lock init issue. CDC is not working correctly under Windows (possible inf issue).
removed readBoardsOrder
… of interrupt number.
Merge remote-tracking branch 'arduino/master' into ide-1.5.x Conflicts: app/src/processing/app/debug/AvrdudeUploader.java build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino hardware/arduino/boards.txt
Merge remote-tracking branch 'arduino/master' into HEAD Conflicts: app/src/processing/app/Base.java todo.txt
For internationalization, the word "Boards" must be wrapped directly in _(...) call. The call was done in makeOrGetBoardMenu(). However, the second call to makeOrGetBoardMenu() has the argument already wrapped by _(...).
The word "Processor" appears in the "Tools" menu. However, this word is not in the "*.po" files. This is because the word is not in any source code files, and is in "boards.txt". This hack is to include this word in the "*.po" files by extracting _(...) calls automatically by gettext tool.
Sorry, it's my mistake to submit the pull request for "master". I close this, and I will submit again for "ide-1.5.x". |
tbowmo
pushed a commit
to tbowmo/Arduino
that referenced
this pull request
Jul 14, 2016
Removed "sensor conditioning code"
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The "Boards" and "Processor" entries would not be extracted from source code files to the language resource catalog "*.po" files. This was because the words are not wrapped in _(...) function call properly in the source code files.
See the commit logs for this branch.